Use the correct setter for a string GValue. (#165203, Damon Chaplin)

2005-01-25  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkimage.c (gtk_image_get_property): Use the correct setter
	for a string GValue.  (#165203, Damon Chaplin)

diff --git a/ChangeLog b/ChangeLog
index f961bf2d118b06b9fc7156c0cb3e9d6af830dbb5..e87b1ce7d2f4050934f923346fe6fc6f2ba58357 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimage.c (gtk_image_get_property): Use the correct setter
+       for a string GValue.  (#165203, Damon Chaplin)
+
 2005-01-24  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f961bf2d118b06b9fc7156c0cb3e9d6af830dbb5..e87b1ce7d2f4050934f923346fe6fc6f2ba58357 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimage.c (gtk_image_get_property): Use the correct setter
+       for a string GValue.  (#165203, Damon Chaplin)
+
 2005-01-24  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f961bf2d118b06b9fc7156c0cb3e9d6af830dbb5..e87b1ce7d2f4050934f923346fe6fc6f2ba58357 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimage.c (gtk_image_get_property): Use the correct setter
+       for a string GValue.  (#165203, Damon Chaplin)
+
 2005-01-24  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkdisplay-x11.c (_gdk_windowing_set_default_display): 

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index b29a2cf54972a64040da15db0e3b8e5c8fd19b9a..0e91ab1750cdfcaf1090d79c0ca6c7f7afe21320 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -466,7 +466,7 @@ gtk_image_get_property (GObject     *object,
       break;
     case PROP_ICON_NAME:
       if (image->storage_type != GTK_IMAGE_ICON_NAME)
-       g_value_set_object (value, NULL);
+       g_value_set_string (value, NULL);
       else
        g_value_set_string (value,
                            image->data.name.icon_name);